From 3014a278ed8bc3b3b24ee3f5407b2b67f4c7664c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 13 Apr 2006 03:40:48 +0000 Subject: [PATCH] Don't allow passing NULL for x1 or x2, adjust callers. 2006-04-12 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't allow passing NULL for x1 or x2, adjust callers. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtktreeview.c | 22 +++++++--------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 852739c57b..2022817314 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't + allow passing NULL for x1 or x2, adjust callers. + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes): Reorganize to avoid a possible NULL pointer dereference. (Coverity) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 852739c57b..2022817314 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-04-12 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't + allow passing NULL for x1 or x2, adjust callers. + * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes): Reorganize to avoid a possible NULL pointer dereference. (Coverity) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 22e80d3a6d..3949bc481d 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -7731,23 +7731,14 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view, else x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree); } - if (x1) - { - *x1 = x_offset; - } + *x1 = x_offset; + if (tmp_column && tmp_column->visible) - { - /* +1 because x2 isn't included in the range. */ - if (x2) - *x2 = *x1 + tree_view->priv->expander_size + 1; - } + /* +1 because x2 isn't included in the range. */ + *x2 = *x1 + tree_view->priv->expander_size + 1; else - { - /* return an empty range, the expander column is hidden */ - if (x2) - *x2 = *x1; - } + *x2 = *x1; } static void @@ -8479,6 +8470,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view, GtkStateType state; GtkWidget *widget; gint x_offset = 0; + gint x2; gint vertical_separator; gint expander_size; GtkExpanderStyle expander_style; @@ -8493,7 +8485,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view, widget = GTK_WIDGET (tree_view); - gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, NULL); + gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, &x2); area.x = x_offset; area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator); -- 2.30.2